Move null header files to a separate directory

diff --git a/xen/arch/ia64/Rules.mk b/xen/arch/ia64/Rules.mk
index 69a78471b29ad69d6b9df4e60d2804fce76f80c8..d1a1dc4a957d1b8d5e071a1b64b31496dff59cd2 100644 (file)
--- a/xen/arch/ia64/Rules.mk
+++ b/xen/arch/ia64/Rules.mk
@@ -9,6 +9,7 @@ AFLAGS  += -D__ASSEMBLY__
 CPPFLAGS  += -I$(BASEDIR)/include -I$(BASEDIR)/include/asm-ia64        \
              -I$(BASEDIR)/include/asm-ia64/linux                       \
             -I$(BASEDIR)/include/asm-ia64/linux-xen                    \
+            -I$(BASEDIR)/include/asm-ia64/linux-null                   \
              -I$(BASEDIR)/arch/ia64/linux -I$(BASEDIR)/arch/ia64/linux-xen
 
 CFLAGS  := -nostdinc -fno-builtin -fno-common -fno-strict-aliasing
@@ -20,6 +21,7 @@ CFLAGS  += -fomit-frame-pointer -I$(BASEDIR)/include -D__KERNEL__
 CFLAGS  += -I$(BASEDIR)/include/asm-ia64 -I$(BASEDIR)/include/asm-ia64/linux \
            -I$(BASEDIR)/include/asm-ia64/linux                                 \
            -I$(BASEDIR)/include/asm-ia64/linux-xen                     \
+          -I$(BASEDIR)/include/asm-ia64/linux-null                     \
            -I$(BASEDIR)/arch/ia64/linux -I$(BASEDIR)/arch/ia64/linux-xen
 CFLAGS  += -Wno-pointer-arith -Wredundant-decls
 CFLAGS  += -DIA64 -DXEN -DLINUX_2_6

diff --git a/xen/include/asm-ia64/linux-null/README.origin b/xen/include/asm-ia64/linux-null/README.origin
new file mode 100644 (file)
index 0000000..7432eb7
--- /dev/null
+++ b/xen/include/asm-ia64/linux-null/README.origin
@@ -0,0 +1,3 @@
+Files in this directory (and subdirectories) are intentionally left blank.
+The sole purpose of this is to avoid removing/ifdefing include lines
+from various source files.

diff --git a/xen/include/asm-ia64/linux-null/asm/desc.h b/xen/include/asm-ia64/linux-null/asm/desc.h
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/xen/include/asm-ia64/linux-null/asm/ia32.h b/xen/include/asm-ia64/linux-null/asm/ia32.h
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/xen/include/asm-ia64/linux-null/asm/module.h b/xen/include/asm-ia64/linux-null/asm/module.h
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/xen/include/asm-ia64/linux-null/asm/pdb.h b/xen/include/asm-ia64/linux-null/asm/pdb.h
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/xen/include/asm-ia64/linux-null/asm/serial.h b/xen/include/asm-ia64/linux-null/asm/serial.h
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/xen/include/asm-ia64/linux-null/asm/sn/arch.h b/xen/include/asm-ia64/linux-null/asm/sn/arch.h
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/xen/include/asm-ia64/linux-null/asm/sn/geo.h b/xen/include/asm-ia64/linux-null/asm/sn/geo.h
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/xen/include/asm-ia64/linux-null/asm/sn/nodepda.h b/xen/include/asm-ia64/linux-null/asm/sn/nodepda.h
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/xen/include/asm-ia64/linux-null/asm/sn/sn_cpuid.h b/xen/include/asm-ia64/linux-null/asm/sn/sn_cpuid.h
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/xen/include/asm-ia64/linux-null/linux/bootmem.h b/xen/include/asm-ia64/linux-null/linux/bootmem.h
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/xen/include/asm-ia64/linux-null/linux/cpu.h b/xen/include/asm-ia64/linux-null/linux/cpu.h
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/xen/include/asm-ia64/linux-null/linux/device.h b/xen/include/asm-ia64/linux-null/linux/device.h
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/xen/include/asm-ia64/linux-null/linux/file.h b/xen/include/asm-ia64/linux-null/linux/file.h
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/xen/include/asm-ia64/linux-null/linux/ioport.h b/xen/include/asm-ia64/linux-null/linux/ioport.h
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/xen/include/asm-ia64/linux-null/linux/kernel_stat.h b/xen/include/asm-ia64/linux-null/linux/kernel_stat.h
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/xen/include/asm-ia64/linux-null/linux/module.h b/xen/include/asm-ia64/linux-null/linux/module.h
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/xen/include/asm-ia64/linux-null/linux/proc_fs.h b/xen/include/asm-ia64/linux-null/linux/proc_fs.h
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/xen/include/asm-ia64/linux-null/linux/profile.h b/xen/include/asm-ia64/linux-null/linux/profile.h
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/xen/include/asm-ia64/linux-null/linux/ptrace.h b/xen/include/asm-ia64/linux-null/linux/ptrace.h
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/xen/include/asm-ia64/linux-null/linux/random.h b/xen/include/asm-ia64/linux-null/linux/random.h
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/xen/include/asm-ia64/linux-null/linux/rtc.h b/xen/include/asm-ia64/linux-null/linux/rtc.h
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/xen/include/asm-ia64/linux-null/linux/seq_file.h b/xen/include/asm-ia64/linux-null/linux/seq_file.h
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/xen/include/asm-ia64/linux-null/linux/serial.h b/xen/include/asm-ia64/linux-null/linux/serial.h
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/xen/include/asm-ia64/linux-null/linux/serial_core.h b/xen/include/asm-ia64/linux-null/linux/serial_core.h
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/xen/include/asm-ia64/linux-null/linux/signal.h b/xen/include/asm-ia64/linux-null/linux/signal.h
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/xen/include/asm-ia64/linux-null/linux/smp_lock.h b/xen/include/asm-ia64/linux-null/linux/smp_lock.h
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/xen/include/asm-ia64/linux-null/linux/swap.h b/xen/include/asm-ia64/linux-null/linux/swap.h
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/xen/include/asm-ia64/linux-null/linux/tty.h b/xen/include/asm-ia64/linux-null/linux/tty.h
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/xen/include/asm-ia64/linux/asm/desc.h b/xen/include/asm-ia64/linux/asm/desc.h
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/xen/include/asm-ia64/linux/asm/ia32.h b/xen/include/asm-ia64/linux/asm/ia32.h
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/xen/include/asm-ia64/linux/asm/module.h b/xen/include/asm-ia64/linux/asm/module.h
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/xen/include/asm-ia64/linux/asm/pdb.h b/xen/include/asm-ia64/linux/asm/pdb.h
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/xen/include/asm-ia64/linux/asm/sn/arch.h b/xen/include/asm-ia64/linux/asm/sn/arch.h
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/xen/include/asm-ia64/linux/asm/sn/geo.h b/xen/include/asm-ia64/linux/asm/sn/geo.h
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/xen/include/asm-ia64/linux/asm/sn/nodepda.h b/xen/include/asm-ia64/linux/asm/sn/nodepda.h
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/xen/include/asm-ia64/linux/asm/sn/sn_cpuid.h b/xen/include/asm-ia64/linux/asm/sn/sn_cpuid.h
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/xen/include/asm-ia64/linux/bootmem.h b/xen/include/asm-ia64/linux/bootmem.h
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/xen/include/asm-ia64/linux/cpu.h b/xen/include/asm-ia64/linux/cpu.h
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/xen/include/asm-ia64/linux/device.h b/xen/include/asm-ia64/linux/device.h
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/xen/include/asm-ia64/linux/file.h b/xen/include/asm-ia64/linux/file.h
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/xen/include/asm-ia64/linux/ioport.h b/xen/include/asm-ia64/linux/ioport.h
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/xen/include/asm-ia64/linux/kernel_stat.h b/xen/include/asm-ia64/linux/kernel_stat.h
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/xen/include/asm-ia64/linux/module.h b/xen/include/asm-ia64/linux/module.h
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/xen/include/asm-ia64/linux/proc_fs.h b/xen/include/asm-ia64/linux/proc_fs.h
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/xen/include/asm-ia64/linux/profile.h b/xen/include/asm-ia64/linux/profile.h
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/xen/include/asm-ia64/linux/ptrace.h b/xen/include/asm-ia64/linux/ptrace.h
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/xen/include/asm-ia64/linux/random.h b/xen/include/asm-ia64/linux/random.h
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/xen/include/asm-ia64/linux/rtc.h b/xen/include/asm-ia64/linux/rtc.h
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/xen/include/asm-ia64/linux/seq_file.h b/xen/include/asm-ia64/linux/seq_file.h
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/xen/include/asm-ia64/linux/serial.h b/xen/include/asm-ia64/linux/serial.h
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/xen/include/asm-ia64/linux/serial_core.h b/xen/include/asm-ia64/linux/serial_core.h
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/xen/include/asm-ia64/linux/signal.h b/xen/include/asm-ia64/linux/signal.h
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/xen/include/asm-ia64/linux/smp_lock.h b/xen/include/asm-ia64/linux/smp_lock.h
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/xen/include/asm-ia64/linux/swap.h b/xen/include/asm-ia64/linux/swap.h
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/xen/include/asm-ia64/linux/tty.h b/xen/include/asm-ia64/linux/tty.h
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/xen/include/asm-ia64/serial.h b/xen/include/asm-ia64/serial.h
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/xen/include/asm-ia64/xenserial.h b/xen/include/asm-ia64/xenserial.h
deleted file mode 100644 (file)
index e69de29..0000000